Skip to content

feat(marcode): merge upstream (t3code april 2026) and remove todo feature#43

Closed
tyulyukov wants to merge 61 commits into
mainfrom
marcode/merge-upstream-preserve-features
Closed

feat(marcode): merge upstream (t3code april 2026) and remove todo feature#43
tyulyukov wants to merge 61 commits into
mainfrom
marcode/merge-upstream-preserve-features

Conversation

@tyulyukov
Copy link
Copy Markdown
Owner

Summary

  • Merge upstream T3 Code (April 2026) with MarCode feature preservation
  • Remove TODO feature (ComposerActiveTasksPanel) that wasn't fully integrated
  • Adopt Node-native TypeScript for desktop and server builds (Node-only, no Bun)
  • Add nightly release channel support with scheduled daily builds
  • Migrate CI/CD to Blacksmith runners for improved performance
  • Add desktop app branding system (resolveDesktopAppBranding) with Dev/Alpha/Nightly stages
  • Implement desktop settings schema validation using Effect/Schema
  • Add update channel persistence and default handling (nightly builds auto-select nightly channel)
  • Extend backend readiness timeout from 10s to 30s and support custom readiness predicates
  • Add provider session reaping with connection leak prevention
  • Add provider status caching to gate desktop startup
  • Add shell snapshot projections for orchestration observability
  • Update Windows/macOS launcher to generate dev-mode icon from PNG source
  • Honor .gitignore during workspace search
  • Add Linux build support (AppImage) and Windows ARM prep

Testing

  • Desktop dev mode launches with correct branding (MarCode Dev)
  • Packaged stable build shows "MarCode (Alpha)" in Dock/title bar
  • Nightly builds auto-select nightly update channel on first launch
  • User can manually switch between stable/nightly channels in settings
  • Backend readiness uses custom path/predicate when provided
  • CLI publishes to npm with correct dist tags (latest/nightly)
  • Release workflow triggers on tag push and daily schedule
  • No regression: notification wiring (applyRecoveredEventBatch calls dispatchTurnNotifications)
  • No regression: window state persists across restarts via ~/.marcode/userdata/window-state.json
  • Client settings load and validate against schema; invalid legacy settings fall back to defaults
  • Workspace entries correctly filter gitignored files

adammansfield and others added 30 commits April 12, 2026 00:18
Co-authored-by: codex <codex@users.noreply.github.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: julius <julius0216@outlook.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
…ingdotgg#1541)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
SAKETH11111 and others added 28 commits April 15, 2026 06:29
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#2049)

Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: tlh38 <tlh38@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…e session monitoring. (pingdotgg#2042)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Absorbed 59 new upstream commits since PR #42 (HEAD 7e1430b..f297e30),
including node-native TS, Windows/Linux titlebar overlay, configurable
project grouping, Opus 4.7 model metadata, filesystem browse API,
Claude session reaper, thread shell summary projections, nightly release
channel, latest-user-message timestamps, coalesced status refreshes,
tooltip on file mentions, terminal Cmd+Backspace, shell snapshot queries,
Windows ARM builds, Kiro editor, Blacksmith CI, and version bumps.

Rejected upstream commits (contradict MarCode CSS content-visibility
scrolling approach):
- 96c9306 Migrate chat scrolling to LegendList
- 33dadb5 Thread timeline autoscroll fix (depends on LegendList)

Hand-merged to preserve MarCode invariants:
- 8dba2d6 tsdown migration: re-added __EMBEDDED_MARCODE_JIRA_REDIRECT_URI__
  and __EMBEDDED_MARCODE_JIRA_TOKEN_PROXY_URL__ defines + backendChildEnv
  injection
- dff8784 titlebar overlay: preserved FULLSCREEN_STATE_CHANNEL,
  windowState.ts persistence, SidebarChromeHeader fullscreen-aware logo
  padding
- 188a40c sidebar grouping: preserved SidebarChromeHeader customizations
- 3e07f5a Opus 4.7 metadata: deduped against our earlier 18216a5
- store.ts: preserved incremental event handlers
  (thread.message-sent/activity-appended/session-set/turn-diff-completed/
  proposed-plan-upserted) and structural-sharing logic while accepting
  upstream's EnvironmentState refactor

Kept HEAD's GitCore upstream refresh cache (targeted ref fetch keyed by
gitCommonDir+upstreamRef+remoteName+upstreamBranch) over upstream's
remote-only coalescing variant — the simpler remote-level key caused
20s+ timeouts in synthetic alias tests using real github.com URLs.

Verification:
- pnpm typecheck clean across all 7 packages
- 2232 tests passing (69 contracts, 106 desktop, 5 client-runtime,
  107 shared, 52 scripts, 1025 web, 868 server)
- Desktop + web builds green
- __EMBEDDED_MARCODE_JIRA_* defines verified present in
  apps/desktop/dist-electron/main.cjs bundle
- All 5 regression guards pass (store, notification wiring, work cards,
  jira chip, window state)

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
- Remove todo checklist feature from UI, settings, and session logic
- Improve folder selection in attachments via command palette
- Fix shell hydration state preservation during mid-turn updates
- Update backend readiness check to use /api/auth/session endpoint
- Preserve MarCode branding throughout merge
- Simplify compact composer controls menu
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.